Android target fixes