Light cleanups in the system module