various fixes in executors