A few more fixes.
Merge branch 'master' of https://github.com/SpaceTown-Developers/Lemon-Gate