diff --git a/samples/irs-demo/cordapp/workflows-irs/build.gradle b/samples/irs-demo/cordapp/workflows-irs/build.gradle
index 1d4dde4086..553bf50f13 100644
--- a/samples/irs-demo/cordapp/workflows-irs/build.gradle
+++ b/samples/irs-demo/cordapp/workflows-irs/build.gradle
@@ -14,6 +14,10 @@ dependencies {
 
     // Corda integration dependencies
     cordaCompile project(':core')
+    
+    // only included to control the `DemoClock` as part of the demo application
+    // normally `:node` should not be depended on in any CorDapps
+    cordaCompile project(':node')
 
     // Cordapp dependencies
     // Specify your cordapp's dependencies below, including dependent cordapps
diff --git a/samples/irs-demo/cordapp/workflows-irs/src/test/kotlin/net/corda/irs/flows/UpdateBusinessDayFlow.kt b/samples/irs-demo/cordapp/workflows-irs/src/main/kotlin/net.corda.irs/flows/UpdateBusinessDayFlow.kt
similarity index 100%
rename from samples/irs-demo/cordapp/workflows-irs/src/test/kotlin/net/corda/irs/flows/UpdateBusinessDayFlow.kt
rename to samples/irs-demo/cordapp/workflows-irs/src/main/kotlin/net.corda.irs/flows/UpdateBusinessDayFlow.kt
diff --git a/samples/irs-demo/web/src/test/kotlin/net/corda/irs/web/api/InterestRatesSwapDemoAPI.kt b/samples/irs-demo/web/src/main/kotlin/net/corda/irs/web/api/InterestRatesSwapDemoAPI.kt
similarity index 100%
rename from samples/irs-demo/web/src/test/kotlin/net/corda/irs/web/api/InterestRatesSwapDemoAPI.kt
rename to samples/irs-demo/web/src/main/kotlin/net/corda/irs/web/api/InterestRatesSwapDemoAPI.kt
diff --git a/samples/irs-demo/web/src/main/resources/static/view/deal.html b/samples/irs-demo/web/src/main/resources/static/view/deal.html
index 30feb20acd..03cee7d575 100644
--- a/samples/irs-demo/web/src/main/resources/static/view/deal.html
+++ b/samples/irs-demo/web/src/main/resources/static/view/deal.html
@@ -20,7 +20,7 @@
                 </tr>
                 <tr class="center aligned">
                     <td>Trade ID</td>
-                    <td>{{deal.ref}}</td>
+                    <td>{{deal.common.tradeID}}</td>
                 </tr>
                 <tr class="center aligned">
                     <td>Valuation Date</td>
diff --git a/samples/irs-demo/web/src/main/resources/static/view/home.html b/samples/irs-demo/web/src/main/resources/static/view/home.html
index 7dc3f8af57..c6734e8f6f 100644
--- a/samples/irs-demo/web/src/main/resources/static/view/home.html
+++ b/samples/irs-demo/web/src/main/resources/static/view/home.html
@@ -45,8 +45,8 @@
             </tr>
             </thead>
             <tbody>
-            <tr class="center aligned" ng-repeat="deal in deals" id="deal-{{deal.ref}}">
-                <td><a href="#/deal/{{deal.ref}}">{{deal.ref}}</a></td>
+            <tr class="center aligned" ng-repeat="deal in deals" id="deal-{{deal.common.tradeID}}">
+                <td><a href="#/deal/{{deal.common.tradeID}}">{{deal.common.tradeID}}</a></td>
                 <td class="single line">{{renderX500Name(deal.fixedLeg.fixedRatePayer)}}</td>
                 <td class="single line">{{deal.fixedLeg.notional}}</td>
                 <td class="single line">{{renderX500Name(deal.floatingLeg.floatingRatePayer)}}</td>