More Android fixes