Some random fixes
Merge pull request #6 from sippeteam/fixes

Fixes