Fixed XML issues caused by lollipop support