bugfixes found during deployment testing