Some cleanups related to assets