Fix problems with Android L