Fix deprecated stuff.