Fixed server

Fixed some stuff I accidentally messed up when trying to resolve the
conflicts