Last LB302 fixes for now (I hope!)