More L5 tweaks