Some BugFixes.