Fixes for Forge, based on log analysis.