USERLAND_ARCHIVES changes: fix samba, remove some hacks