Tweaks for django rest framework 3

[#79778376]

Bear in mind for [#78037278]