Fixes from my previous attempt to stop using autotools for SBSMS...