Beginnings of fix for mobile assets