Fix the left-over references to system/modules