Fixes some compilations errors
Merge branch 'WIP' of github.com:GP-S/HOTS into WIP