Fix issues with tenant specific scripts