Fix method redefinition warnings.
Merge pull request #291 from warningfree/fix_warnings

Fix method redefinition warnings.