fixes for froyo-gb