More updates for manifest v2.