Fixup build errors