SBT fixes