Operation apply fixes