Some ISUPPORT fixes