Minor fixes to previous merge (#2359)