s3-lsasd: Import fixes from spoolssd