Uses new Executor interface
Minor fixes