More screw up fixes