Tweaks to L5