Fixes for LR6.2 - performance mostly