diff --git a/client/coral-admin/src/containers/Configure/ModerationSettings.js b/client/coral-admin/src/containers/Configure/ModerationSettings.js
index 56be58c02..c7df573e8 100644
--- a/client/coral-admin/src/containers/Configure/ModerationSettings.js
+++ b/client/coral-admin/src/containers/Configure/ModerationSettings.js
@@ -80,7 +80,7 @@ const ModerationSettings = ({settings, updateSettings, onChangeWordlist}) => {
         onChangeWordlist={onChangeWordlist} />
 
       {/* Edit Comment Timeframe */}
-      <Card className={`${styles.configSetting}`}>
+      <Card className={styles.configSetting}>
         <div className={styles.settingsHeader}>{lang.t('configure.edit-comment-timeframe-heading')}</div>
         <p>
           {lang.t('configure.edit-comment-timeframe-text-pre')}
diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index deb604b5c..145098672 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -201,6 +201,8 @@ const extension = {
     }) => ({
       updateQueries: {
         EmbedQuery: (previousData, {mutationResult: {data: {editComment: {comment, errors}}}}) => {
+
+          // @TODO (kiwi) revisit after streamlining error handling
           if (errors && errors.length) {
             return previousData;
           }
diff --git a/services/comments.js b/services/comments.js
index f5defb935..def557c96 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -55,7 +55,7 @@ module.exports = class CommentsService {
     // original query.
     let lastEditableCommentCreatedAt;
     if (!ignoreEditWindow) {
-      const editWindowMs = (await SettingsService.retrieve()).editCommentWindowLength;
+      const {editCommentWindowLength: editWindowMs} = await SettingsService.retrieve();
       lastEditableCommentCreatedAt = new Date((new Date()).getTime() - editWindowMs);
       query.created_at = {
         $gt: lastEditableCommentCreatedAt,