Bugfixes/NativeStat
Manager code cleanup
NativeStat/BugFixes