Small Android changes