Some minor changes
Merge branch 'master' of https://github.com/MetropoliaPortal/Engine
Didn't fix the bug, but..