Applied Forge 1.x changes