fix some Issues