Fixed the build errors in the last checkin.