Fixed problems with Froyo and Gingerbread compatibility