Various additions and fixes on mutability