Fixes for sm10