Fix the rw wrappers