fixes to pass smoke tests.