Assets fixes