Fixes to system configuration.