Initial attempt to fix travis builds.