Fixes for SGM