fix some buggy annotations