[BENTO-15] Get rid of deprecation warnings