Added some changes that we'll need for pubcookie protecting the site.