Fixes for Forge