Fix client/server side stuff