multiple fixes travis