Fix actual deprecation warning
Some deprecation warnings could be a bit more complicated than just rename some imports, in this situation, list them here and fix only the ones easy to fix.
The main idea is to reduce to the minimum deprecation warnings as possible.