Fix 2 little Bugs
Fix little Bugs