Fix Some Errors Related to PR #321