Some MOre BugFixes