Some fixes for Forge.