Fix a few things for lollipop