Minor tweaks to improve initial loading of data into memory