Tweaked handling of commands