Fix outstanding issues involving reading