Fixups for deployment.