Troubleshooting and Common fixes

Troubleshooting and Common fixes