Some CS Fixes on modules