stability fixes.

Revert "more L changes.. :/"

This reverts commit 03d7c56a75f2a559fc7b0afc6d9932cbee4ac918.