Fixups for f-ups
Merge pull request #5 from martinthomson/fixups

Fixups for f-ups