Fix deprecated calls.