Additional changes for travis test failure.