Fixed some issues found in implementing SubSystems