Cleaning up signatures to match actual API methods.