More execute fixes