diff --git a/src/MagiWrapper.ts b/src/MagiWrapper.ts
index 9796c8e..edc6afc 100644
--- a/src/MagiWrapper.ts
+++ b/src/MagiWrapper.ts
@@ -43,7 +43,7 @@ export class MagiWrapper extends BaseContractWrapper {
 			priceUpdateCoolDown: (await this.contract.methods.priceUpdateCoolDown().call()) * 1000,
 			numOfPrices: Number(await this.contract.methods.numOfPrices().call()),
 			lastOperationTime: (await this.contract.methods.lastOperationTime().call()) * 1000,
-			operationCoolDown: (await this.contract.methods.lastOperationTime().call()) * 1000
+			operationCoolDown: (await this.contract.methods.operationCoolDown().call()) * 1000
 		};
 	}
 
@@ -138,7 +138,7 @@ export class MagiWrapper extends BaseContractWrapper {
 			.send(
 				await this.web3Wrapper.getTransactionOption(
 					account,
-					CST.UPDATE_ROLE_MANAGER_GAS,
+					CST.UPDATE_OPERATOR,
 					option
 				)
 			);
diff --git a/src/__snapshots__/DualClassWrapper.test.ts.snap b/src/__snapshots__/DualClassWrapper.test.ts.snap
index fdd10c2..a2a2bef 100644
--- a/src/__snapshots__/DualClassWrapper.test.ts.snap
+++ b/src/__snapshots__/DualClassWrapper.test.ts.snap
@@ -562,7 +562,7 @@ Array [
   Array [
     Object {
       "from": "account",
-      "gas": 50000,
+      "gas": 100000,
       "gasPrice": 1000000000,
       "nonce": 10,
     },
@@ -582,12 +582,12 @@ exports[`setValue 4`] = `
 Array [
   Array [
     "account",
-    50000,
+    100000,
     Object {},
   ],
   Array [
     "account",
-    50000,
+    100000,
     Object {
       "gasLimit": 20000,
       "gasPrice": 2000000000,
diff --git a/src/__snapshots__/MagiWrapper.test.ts.snap b/src/__snapshots__/MagiWrapper.test.ts.snap
index aaabee6..ac4274d 100644
--- a/src/__snapshots__/MagiWrapper.test.ts.snap
+++ b/src/__snapshots__/MagiWrapper.test.ts.snap
@@ -77,7 +77,7 @@ Object {
   "isStarted": false,
   "lastOperationTime": 1234567890000,
   "numOfPrices": 0,
-  "operationCoolDown": 1234567890000,
+  "operationCoolDown": 1000000,
   "priceFeedTimeTolerance": 60000,
   "priceFeedTolerance": 0.01,
   "priceTolerance": 0.05,
@@ -109,12 +109,12 @@ exports[`setValue 3`] = `
 Array [
   Array [
     "account",
-    50000,
+    100000,
     Object {},
   ],
   Array [
     "account",
-    50000,
+    100000,
     Object {
       "gasLimit": 200000,
       "gasPrice": 2000000000,
@@ -178,12 +178,12 @@ exports[`updateOperator 2`] = `
 Array [
   Array [
     "account",
-    1000000,
+    100000,
     Object {},
   ],
   Array [
     "account",
-    1000000,
+    100000,
     Object {
       "gasLimit": 200000,
       "gasPrice": 2000000000,
@@ -210,12 +210,12 @@ exports[`updatePriceFeed 3`] = `
 Array [
   Array [
     "account",
-    120000,
+    100000,
     Object {},
   ],
   Array [
     "account",
-    120000,
+    100000,
     Object {
       "gasLimit": 200000,
       "gasPrice": 2000000000,
diff --git a/src/constants.ts b/src/constants.ts
index 2391d4f..027b80e 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -81,7 +81,7 @@ export const PROVIDER_MYETHER_MAIN = 'https://api.myetherapi.com/eth';
 export const PROVIDER_INFURA_MAIN = 'https://mainnet.infura.io';
 export const PROVIDER_INFURA_KOVAN = 'https://kovan.infura.io';
 export const TRANSFER_TOKEN_GAS = 120000;
-export const SET_VALUE_GAS = 50000;
+export const SET_VALUE_GAS = 100000;
 export const COLLECT_FEE_GAS = 40000;
 export const ADD_ADDR_GAS = 40000;
 export const REMOVE_ADDR_GAS = 40000;
@@ -94,7 +94,8 @@ export const RESET_GAS_LIMIT = 4000000;
 export const START_CUSTODIAN_GAS = 1000000;
 export const FETCH_PRICE_GAS = 150000;
 export const START_MAGI_GAS = 120000;
-export const UPDATE_PRICE_FEED = 120000;
+export const UPDATE_PRICE_FEED = 100000;
+export const UPDATE_OPERATOR = 100000;
 export const COMMIT_PRICE_GAS = 80000;
 export const UPDATE_ROLE_MANAGER_GAS = 1000000;
 export const DEFAULT_TX_GAS_LIMIT = 30000;