Merge pull request #1 from cavedweller/fuchsia-fixup

Fuchsia fixup