More annotation conversions