Fixed remaining offences (not in todos)