Some more fixes for the Forge version