fix all issues for lollipop