The signatures of some functions have been fixed.