Alvaro's table fixes