Update to new mut conventions