wip/samba build fixes, need cleaning up.