Update more tables correctly