Address failures on Travis