Still fixing some fallout of the Windows binary location move.