Made changes to avoid failure on travis