Fix minor bugs
Merge pull request #1136 from TechEmpower/scorched_earth

Fix minor bugs