some cosmetic changes for system.base component