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
Merge pull request #833 from diizy/stable-1.1

LB302: further fixes