Some minor changes to allow read to work properly