Fixup for build