Fix some deprecation warnings

Line is too long. [125/110]