BugFixes for Typing Errors