Fix a few mutability warnings