issue #2404: Invocation of some deprecated methods fixes.