Missing fixes from the subject rewrite.
Merge pull request #659 from akarnokd/SubjectsFixAdditional

Missing fixes from the subject rewrite