Fix doc and gi annotations