fixes to pass smoketest