Troubleshooting and recovery for VCS