minor BugFixes