Update to remove deprecated warnings