General hygiene fixes