A few quick fixes.
Merge pull request #80 from facebook/gFosco.fixes

A few quick fixes.