Next portion of LR6.2 fixes