More bug fix attempts
Merge branch 'master' of https://github.com/HFOSS-OVC/Open-Video-chat