[SMB] Fixes from feedback on pr #128