Fixing sbt & scala version related issues