executor bug fixes