Extra SBT/Scala tweaks