Bobjana lb3

Some fixes I pulled in.