More build refinement for travis build