Fixes for integration with Diva Distro