Fixed XML annotations