Few minor fixes to make app working on Froyo