Fix rebase on execwork