Improved support for Froyo devices