more fixes for dev test failures