BZ-99999 Fix more build errors.