Fixing method signatures to be compatible with latest 2.x release.