Merge pull request #128 from smillidge/master

Fix a whole bunch of broken MBean statistics