Fix deprecated interfaces