Fix execution of non-async commands