Fix some deprecation warnings

Line is too long. [127/110]