More tweaks to get SBT build working, leaving out Berkeley for now