Fixes for ReadAllRecords