fix some build breakage