Minor fixes in command order execution.