More isupports impl fixes