fix leftovers