diff --git a/contracts/src/main/java/com/r3corda/contracts/JavaCommercialPaper.java b/contracts/src/main/java/com/r3corda/contracts/JavaCommercialPaper.java
index 690111d5a2..9a50062d29 100644
--- a/contracts/src/main/java/com/r3corda/contracts/JavaCommercialPaper.java
+++ b/contracts/src/main/java/com/r3corda/contracts/JavaCommercialPaper.java
@@ -229,7 +229,7 @@ public class JavaCommercialPaper implements Contract {
         return SecureHash.sha256("https://en.wikipedia.org/wiki/Commercial_paper");
     }
 
-    public TransactionBuilder generateIssue(@NotNull PartyAndReference issuance, @NotNull Amount faceValue, @Nullable Instant maturityDate, @NotNull Party notary) {
+    public TransactionBuilder generateIssue(@NotNull PartyAndReference issuance, @NotNull Amount<Issued<Currency>> faceValue, @Nullable Instant maturityDate, @NotNull Party notary) {
         State state = new State(issuance, issuance.getParty().getOwningKey(), faceValue, maturityDate);
         TransactionState output = new TransactionState<>(state, notary);
         return new TransactionType.General.Builder().withItems(output, new Command(new Commands.Issue(), issuance.getParty().getOwningKey()));
diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/cash/Cash.kt b/contracts/src/main/kotlin/com/r3corda/contracts/cash/Cash.kt
index 75af9d6902..871972ced3 100644
--- a/contracts/src/main/kotlin/com/r3corda/contracts/cash/Cash.kt
+++ b/contracts/src/main/kotlin/com/r3corda/contracts/cash/Cash.kt
@@ -172,7 +172,7 @@ class Cash : FungibleAsset<Currency>() {
         val keysUsed = gathered.map { it.state.data.owner }.toSet()
 
         val states = gathered.groupBy { it.state.data.deposit }.map {
-            val (deposit, coins) = it
+            val coins = it.value
             val totalAmount = coins.map { it.state.data.amount }.sumOrThrow()
             TransactionState(State(totalAmount, to), coins.first().state.notary)
         }
diff --git a/contracts/src/test/kotlin/com/r3corda/contracts/cash/CashTests.kt b/contracts/src/test/kotlin/com/r3corda/contracts/cash/CashTests.kt
index 163a1378db..bcafcbe3c1 100644
--- a/contracts/src/test/kotlin/com/r3corda/contracts/cash/CashTests.kt
+++ b/contracts/src/test/kotlin/com/r3corda/contracts/cash/CashTests.kt
@@ -385,7 +385,7 @@ class CashTests {
             makeCash(80.SWISS_FRANCS, MINI_CORP, 2)
     )
 
-    fun makeSpend(amount: Amount<Currency>, dest: PublicKey, corp: Party, depositRef: OpaqueBytes = defaultRef): WireTransaction {
+    fun makeSpend(amount: Amount<Currency>, dest: PublicKey, @Suppress("UNUSED_PARAMETER") corp: Party, @Suppress("UNUSED_PARAMETER") depositRef: OpaqueBytes = defaultRef): WireTransaction {
         val tx = TransactionType.General.Builder()
         Cash().generateSpend(tx, amount, dest, WALLET)
         return tx.toWireTransaction()
@@ -516,8 +516,8 @@ class CashTests {
                 Cash.State(4000.DOLLARS `issued by` defaultIssuer, MEGA_CORP_PUBKEY)
         )
         // Test that summing everything produces the total number of dollars
-        var expected = 7000.DOLLARS `issued by` defaultIssuer
-        var actual = states.sumCash()
+        val expected = 7000.DOLLARS `issued by` defaultIssuer
+        val actual = states.sumCash()
         assertEquals(expected, actual)
     }