More config improvements