Fixed some warnings in SM 1.7