Fix legacy policy payload