Correct some issues with monitors and statistics