Troubleshooting

Fix common integration issues