More system-config changes