Bug fixes, add method to rebuild refs/holders.