Fixed other minor things