Tweaks and fix for LREM