Some fixes to the last commit, the Ventatiendas one.