diff --git a/src/components/views/elements/Field.tsx b/src/components/views/elements/Field.tsx
index 771d2182ea..0a3aa8ed71 100644
--- a/src/components/views/elements/Field.tsx
+++ b/src/components/views/elements/Field.tsx
@@ -18,7 +18,7 @@ import React from 'react';
 import classNames from 'classnames';
 import * as sdk from '../../../index';
 import { debounce } from 'lodash';
-import {IFieldState, IValidationResult} from "../elements/Validation";
+import {IFieldState, IValidationResult} from "./Validation";
 
 // Invoke validation from user input (when typing, etc.) at most once every N ms.
 const VALIDATION_THROTTLE_MS = 200;
@@ -29,7 +29,7 @@ function getId() {
     return `${BASE_ID}_${count++}`;
 }
 
-interface IProps extends React.InputHTMLAttributes<HTMLSelectElement | HTMLInputElement> {
+interface IProps extends React.InputHTMLAttributes<HTMLSelectElement | HTMLInputElement | HTMLTextAreaElement> {
     // The field's ID, which binds the input and label together. Immutable.
     id?: string,
     // The element to create. Defaults to "input".
diff --git a/src/settings/controllers/NotificationControllers.js b/src/settings/controllers/NotificationControllers.js
index 395da765a1..f74dc22e84 100644
--- a/src/settings/controllers/NotificationControllers.js
+++ b/src/settings/controllers/NotificationControllers.js
@@ -45,7 +45,7 @@ export class NotificationsEnabledController extends SettingController {
         if (!getNotifier().isPossible()) return false;
 
         if (calculatedValue === null || calculatedAtLevel === "default") {
-            return isMasterRuleEnabled();
+            return !isMasterRuleEnabled();
         }
 
         return calculatedValue;
@@ -63,7 +63,7 @@ export class NotificationBodyEnabledController extends SettingController {
         if (!getNotifier().isPossible()) return false;
 
         if (calculatedValue === null) {
-            return isMasterRuleEnabled();
+            return !isMasterRuleEnabled();
         }
 
         return calculatedValue;
diff --git a/src/settings/handlers/LocalEchoWrapper.js b/src/settings/handlers/LocalEchoWrapper.js
index 4cbe4891be..fd0510296a 100644
--- a/src/settings/handlers/LocalEchoWrapper.js
+++ b/src/settings/handlers/LocalEchoWrapper.js
@@ -39,7 +39,7 @@ export default class LocalEchoWrapper extends SettingsHandler {
         const cacheRoomId = roomId ? roomId : "UNDEFINED"; // avoid weird keys
         const bySetting = this._cache[settingName];
         if (bySetting && bySetting.hasOwnProperty(cacheRoomId)) {
-            return bySetting[roomId];
+            return bySetting[cacheRoomId];
         }
 
         return this._handler.getValue(settingName, roomId);