minor cleanup from merge fixes