LB302: further fixes

- My earlier fixes caused some new issues, now I'm fixing them, this time I'm pretty sure there won't be anything I missed