Lr some fixes

:grimacing: