Fix up travis builds