Design fixes for Forge