Troubleshooting page further fixes