Fix mutable annotations