Fix import order, some settings were not overridden