Load time speed up tweaks