Fix partner and goal edit