Light cleanups in the system module
Merge pull request #84 from zsbzsb/update/system_consistency

Light cleanups in the system module