fix some fails