diff --git a/ui/component/claimTilesDiscover/view.jsx b/ui/component/claimTilesDiscover/view.jsx
index 128cdc664..069c8f7ca 100644
--- a/ui/component/claimTilesDiscover/view.jsx
+++ b/ui/component/claimTilesDiscover/view.jsx
@@ -147,7 +147,7 @@ function ClaimTilesDiscover(props: Props) {
     mutedUris,
     liveLivestreamsFirst,
     livestreamMap,
-    pin, // let's pin from /web folder
+    pin,
     pinUrls,
     prefixUris,
     showNoSourceClaims,
diff --git a/ui/component/fileViewCount/view.jsx b/ui/component/fileViewCount/view.jsx
index 9881b3f4d..8a40c0fd7 100644
--- a/ui/component/fileViewCount/view.jsx
+++ b/ui/component/fileViewCount/view.jsx
@@ -37,12 +37,12 @@ function FileViewCount(props: Props) {
 
   return (
     <span className="media__subtitle--centered">
-      {isLive &&
+      {livestream &&
         __('%viewer_count% currently %viewer_state%', {
           viewer_count: activeViewers === undefined ? '...' : activeViewers,
           viewer_state: isLive ? __('watching') : __('waiting'),
         })}
-      {!isLive &&
+      {!livestream &&
         activeViewers === undefined &&
         (viewCount !== 1 ? __('%view_count% views', { view_count: formattedViewCount }) : __('1 view'))}
       {!SIMPLE_SITE && <HelpLink href="https://lbry.com/faq/views" />}
diff --git a/ui/component/livestreamComments/view.jsx b/ui/component/livestreamComments/view.jsx
index 0421725bc..8fd690d91 100644
--- a/ui/component/livestreamComments/view.jsx
+++ b/ui/component/livestreamComments/view.jsx
@@ -159,7 +159,7 @@ export default function LivestreamComments(props: Props) {
           </div>
         )}
         <div ref={commentsRef} className="livestream__comments-wrapper">
-          {viewMode === VIEW_MODE_CHAT && superChatsTotalAmount > 0 && (
+          {viewMode === VIEW_MODE_CHAT && superChatsTotalAmount > 0 && superChats && (
             <div className="livestream-superchats__wrapper">
               <div className="livestream-superchats__inner">
                 {superChats.map((superChat: Comment) => (
diff --git a/ui/constants/form-field.js b/ui/constants/form-field.js
index f282e3116..7c011626e 100644
--- a/ui/constants/form-field.js
+++ b/ui/constants/form-field.js
@@ -1,6 +1,6 @@
 export const FF_MAX_CHARS_DEFAULT = 2000;
 export const FF_MAX_CHARS_IN_COMMENT = 2000;
-export const FF_MAX_CHARS_IN_LIVESTREAM_COMMENT = 500;
+export const FF_MAX_CHARS_IN_LIVESTREAM_COMMENT = 300;
 export const FF_MAX_CHARS_IN_DESCRIPTION = 5000;
 export const FF_MAX_CHARS_REPORT_CONTENT_DETAILS = 500;
 export const FF_MAX_CHARS_REPORT_CONTENT_ADDRESS = 255;