More changes to make Froyo compatible.