Fixing a large part of the leaking metadata is definitely a win, no?