Fixed miscellaneous minor things