More asset fixups