some regression fixes