fixup for new source tree layout