Fixing compile problems with Forge 916