BugFixes again