Section 'System management' - some improvements