Fix build warnings/breakage.