Fixed up minor things