Adjustments for better Travis-CI testing