Fixes for large numbers of records