Fix some leftovers