Fixes according to the review.
Merge branch 'feature/55402262/missing-stuff-for-privdog' into develop