Fixed MAC OS X server issues