SBT

Several SBT-related fixes and adjustments