Fix non-built-in commands