Fixed some stupid screw-ups