lollipop errors fixed