diff --git a/client/src/containers/AssetDisplay/view.jsx b/client/src/containers/AssetDisplay/view.jsx
index 29c320ee..c12ad741 100644
--- a/client/src/containers/AssetDisplay/view.jsx
+++ b/client/src/containers/AssetDisplay/view.jsx
@@ -64,7 +64,7 @@ class AssetDisplay extends React.Component {
     if (typeof contentType === 'string') {
       fileExt = contentType.split('/')[1] || 'jpg';
     }
-    const sourceUrl = `${createCanonicalLink({ asset: asset.claimData })}.${fileExt}?${outpoint}`;
+    const sourceUrl = `${createCanonicalLink({ asset: asset.claimData })}.${fileExt}?outpoint=${outpoint}`;
     return (
       <div className={'asset-display'}>
         {(status === LOCAL_CHECK) &&
diff --git a/client/src/containers/AssetInfo/view.jsx b/client/src/containers/AssetInfo/view.jsx
index 0f3a6187..59360840 100644
--- a/client/src/containers/AssetInfo/view.jsx
+++ b/client/src/containers/AssetInfo/view.jsx
@@ -37,7 +37,7 @@ class AssetInfo extends React.Component {
         { description && (
           <RowLabeled
             label={<Label value={'Description'} />}
-            content={<div className='asset-info__description'><ReactMarkdown source={description}/></div>}
+            content={<div className='asset-info__description'><ReactMarkdown source={description} disallowedTypes={['image']}/></div>}
           />
         )}
         {editable && (
diff --git a/server/utils/getClaimData.js b/server/utils/getClaimData.js
index 883bcd08..f725f94e 100644
--- a/server/utils/getClaimData.js
+++ b/server/utils/getClaimData.js
@@ -10,7 +10,14 @@ module.exports = async (data, chName = null, chShortId = null) => {
   // TODO: Refactor getching the channel name out; requires invasive changes.
   const dataVals = data.dataValues ? data.dataValues : data;
   const txid = dataVals.transaction_hash_id || dataVals.txid;
-  const nout = dataVals.vout || dataVals.nout;
+  let nout;
+
+  if (typeof dataVals.vout === 'number') {
+    nout = dataVals.vout;
+  } else {
+    nout = dataVals.nout;
+  }
+
   const outpoint = `${txid}:${nout}`;
   const certificateId = dataVals.publisher_id || dataVals.certificateId;
   const fileExt = data.generated_extension || dataVals.fileExt;