Engine: Updates to fix page loading after initial setup.
Merge pull request #3251 from ehelms/engine-setup

Engine: Updates to fix page loading after initial setup.