Fixing travis failures