Fixed running ubuntu without samba. Minor fixes