BZ-99999 Fixing build errors.