Fixing two small problems