Some assets fixes