regression fixes and improvements