Fixes for SGM integration