Updates for new forge and mistakes