Fix command line create/restore