Fixing up server stuff