Attempt to fix build errors in travis builds.