Fix some minor things