Attempt to fix credentials + minor SBT changes