Two small changes to allow Canvas to use an Asset or Credential.