Call signatures harmonized.
Bug fixes.