Various changes regarding Read-Write issues