More assets serving fixes