round up some server-side changes