Add troubleshooting scenarios and fixes