Fix failing travis builds