mutability fixes