Fixed some screw ups