Fixed issues with Android L