Fixed some leftovers from the old scheme.