More changes needed separate builddir