Fixing some leftovers.