Some more on CompUnitRepo and CompUnit