More changes/fixes from the HTC Ace