Add more troubleshooting