Fix screwups