Fixing minor things