Fix builddir != srcdir issues