Minor fixes
Merge branch 'master' into monitoring
Fixed rate calculation