Fix some more compile issues in the Forge version