Various tweaks for first data loading command