fix some leftovers from previous merge