Fix travis CI conf + small fixes elsewhere