Fix issues from smoke test.