Merge Scott’s fixes from last night.