Various lc/lnc fixes/enhancements