More metadata improvements