fix some leftovers