Fixed some old bugs
Merge branch 'ssl' of https://github.com/mpaciore/scalarm_monitoring into ssl