Fix bugs which broke federation due to changes in function signatures.