Fixed some issues with Executor.getCommands