More Samba4 workarounds