- regression fixes for v6