Few more fixes to address failing tests.