Small BugFixes