Fixed up tracking of binaries -- try 2