Fixing Travis CL build issues