Modifications for travis build