Fix fields in server handler