Fixed some leftovers