Porting code to allow isf and ise-default to build