(CSRFReferer) Fixes from review feedback