Minor fixes to the modifiers support