BugFixes for beta-1