ISUPPORT fixes