Fixes for server-side
More server-side glue
More server stuff