Fixes to final version for ScalaDays'14