More tweaks to correct page flashing.