More SBSMS fixes