BuildList bug fixing (still memory leaks)