Fixes for None assets