travis and fixes