Couple of things to help with L5.

Worked great otherwise!