Re: slapo-smbk5pwd build fixes