Minor changes to custom server