Bug fixes

Also compatibility fix for Horizon (spacebuild-like gamemode)