diff --git a/common/libs/keystore.js b/common/libs/keystore.js
index e8eaa5d0..da32efe9 100644
--- a/common/libs/keystore.js
+++ b/common/libs/keystore.js
@@ -117,7 +117,7 @@ export function fromV3KeystoreToPkey(input: string, password: string): Buffer {
     derivedKey.slice(0, 16),
     new Buffer(kstore.crypto.cipherparams.iv, 'hex')
   );
-  let seed = decipherBuffer(decipher, ciphertext, 'hex');
+  let seed = decipherBuffer(decipher, ciphertext);
   while (seed.length < 32) {
     let nullBuff = new Buffer([0x00]);
     seed = Buffer.concat([nullBuff, seed]);
diff --git a/common/reducers/swap.js b/common/reducers/swap.js
index f3bf050f..a4eb58c2 100644
--- a/common/reducers/swap.js
+++ b/common/reducers/swap.js
@@ -24,7 +24,7 @@ type State = {
   orderTimestampCreatedISOString: ?string,
   paymentAddress: ?string,
   validFor: ?number,
-  orderId: string
+  orderId: ?string
 };
 
 export const INITIAL_STATE: State = {