Annotations improvements and fixes.