travis and other fixes