Fixed issues with Lollipop