Fix node commands to ensure backup and restore have the correct steps in all cases, and upgrades work correctly.