Missed minor bits from merge