Shut deprecation warnings up

Ticket: #6071