More bugfixes for stats
Merge branch 'master' of github.com:somasonic/RServ