changes to get running on Android L