Final fixes for first deploy.