Just some minor things when converting