Commit 174d3a15d69560032d5aa9b0c3b2a2c6413a2717

Stephen Moloney 2016-05-23T12:12:36

tidy up compilation errors