Fixes for test failures introduced by a very recent checkin