Cleanups for travis building.