Fix screw ups