Fix Travis failures