Don't use internally deprecated methods

During some code-review I've found some places where library used deprecated methods.

Some grep'ping helped me to fix that.