Additional SBT 13 refactoring