Upgrade and fix for samba pack