Fixes to system module classes.