LPS-46191 SF

A few small fixes. I believe it'scompletely working on master now.