Changes and bug fixes related to implementing Sabretooth MC