Fix naming issue.  Fix bug with optional ForeignKey field.