Some little Fixes