Fixed some typeos
Fixed merged conflict #1348
Merge pull request #1352 from pennij/working_mon0520

Fixed merge conflict for PR #1348