Fixed issue: Minor fixes to system class