Server fixes

Continuing #22