Minor cleanup regarding assets