Last minute bugfixes
Merge branch 'dreamvids-2.0' of https://github.com/DreamVids/DreamVids into dreamvids-2.0