Assets, resource improvements, #2635 is unnecessary now