* Annotations tweaks