Fix up misc bugs

* Works with OS X as server