More Android fixes.