added some more missing annotation scope checks