Fixed some issues with Samba