Fixed some issues for Diva Distro