Fixed smoke test failures.