Some more compile fixes for the Forge version