Statdatamanager bug fixes