Fix even more compile issues in the Forge version