Fixing minor issues...