Fixing some minor things