Fix some smaller Issues