Minor cleanup before merge