Fix issues with Travis tests