Fix string escaping in commands