Changes to make the project work with latest versions of SBT and IntelliJ