Fix problems evidenced by Travis