tiny changes to support external config