Fixes for deployment test failures.