Tweaks to get running at LR