Fixed a few issues with page-load errors.