Small fixes
Goat Janitor