Fix minor things