BZ-0000: Fix build errors