some fixes to make the examples work after the sbt switch.