More troubleshooting changes