Fixed some general derps