Some fixes to support the preliminary config uuid