Fixes to get the sbt build working