made build paths more robust