Address travis failures