crash/anr fixes