Take two at fixing out of source builds