Add samba fixes from #1555