Fixed (?) tenant specific scripts (issue#111)