More hygiene of modifications