Small Forge fixes