Fix issues with travis build