Fixed some bad @Support annotations