fix some Problems