fixes in samba migration