Improved travis compatibility