Minor adjustments related to self suppress