Add nop control for modify action
More tweaks