Smaller BugFixes