Updates and fixes with Alejandro in airpair session.