More fixes to build openchange with zentyal's samba