CD-2 save_app script fixes on commands and arguments