More assets fixes.