64 bit warning, and fixes re-visiting the building list.