Minor regression fixes.