Misc fixes
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer