Small fixes
Merge branch 'master' of https://github.com/nicnys-8/mediating-presence