Minor style/configuration changes.