Looks good; do you want the glob fix to go on this branch or a separate one?