* Some Android fixes