More fixing for subjectless requests...