Fix a type and add more commands for recovery