Changes for travis build