travis support and fixes