Misc lollipop updates

And a bugfix or two :)