Android app fixes