Fixes to LR6.2