Bug fixes from finally deploying a test copy.