some improvements/fixes for IS and partners