Fix failing travis tests.