Fixes based on Lourdes's comments