Minor tweaks for the full load memory issues