Fixed multidex bugs