Lollipop fixes