TUP-2510: fixed the compile errors.