xps and teck config improvements