Change some modifiers to make more sense