Finalize fix to deploy, and also fix up errata