BZ-0000: fix build errors