fixes for sgs