MDL-37993 adjustments as suggested by Tim