Fixed issues for Travis