Privileged service fixes