Caldecott external tools bug fixes