Misc fixes from running through test set / 9.0.7
Updated file manifest (fix)
Minor CPF bug when joining