More fixes for None assets