More lollipop updates

Same disclaimer as previous commit