Fix small bugs in Executors