Exit from lpm mode fixes

Cosmetic problem: looks odd when default is not the the last case