Merge pull request #121 from haberman/fuzz-fixes

Several fuzz fixes.