Minor Android changes