Handful of minor fixes cleaning up my stupid