Fix travis failures based on suggestion by @berdir