Add the additional arguments for the custom collator support.
Fix a typo, change directory before checking out a branch.