diff --git a/viat/blocks/block.js b/viat/blocks/block.js
index 48ddc05d..97c9532f 100644
--- a/viat/blocks/block.js
+++ b/viat/blocks/block.js
@@ -121,7 +121,7 @@ export class Block {
 		this.setMeta('nonce', this.cipherSuite.createBlockNonce(this.nonceSize));
 	}
 	async createSignature(wallet) {
-		const binary = await this.exportDataBinary();
+		const binary = this.block.hash;
 		const signature = await wallet.signPartial(binary);
 		return signature;
 	}
@@ -193,9 +193,6 @@ export class Block {
 	}
 	setCore(primaryArg, value) {
 		if (isPlainObject(primaryArg)) {
-			if (primaryArg.amount) {
-				primaryArg.amount = toSmallestUnit(primaryArg.amount, 'mana');
-			}
 			assign(this.block.data.core, primaryArg);
 			return this;
 		}
diff --git a/viat/math/coin.js b/viat/math/coin.js
index a8b74f63..a5e8d900 100644
--- a/viat/math/coin.js
+++ b/viat/math/coin.js
@@ -117,9 +117,7 @@ export function toSmallestUnit(value) {
 		return parseStringUnits(value);
 	} else if (isBigInt(value)) {
 		const strValue = value.toString();
-		if (isBigIntBelowMaxSupply(value) && strValue.length <= coinMaxSupplyLength) {
-			return value;
-		}
+		return parseStringUnits(strValue);
 	}
 	return;
 }
diff --git a/viat/wallet/wallet.js b/viat/wallet/wallet.js
index 3a18123c..d2e44c3a 100644
--- a/viat/wallet/wallet.js
+++ b/viat/wallet/wallet.js
@@ -23,8 +23,10 @@ export class Wallet extends CryptoID {
 			}
 		});
 		await txBlock.finalize();
+		await txBlock.sign(this);
 		await txBlock.createReceipt();
 		await txBlock.receipt.finalize();
+		await txBlock.receipt.sign(this);
 		console.log('Transaction Block:', txBlock.block);
 		return txBlock;
 	}