Fix some Problems