Last LB302 fixes for now (I hope!)
Merge pull request #839 from diizy/lb302

Last LB302 fixes for now (I hope!)