BinaryBuilder: Fix paths more thoroughly