Fix legacy policy submit issues