Fix minor bugs
Merge remote-tracking branch 'upstream/scorched_earth'
Merge pull request #1136 from TechEmpower/scorched_earth

Fix minor bugs
Merge remote-tracking branch 'upstream/master'