Merge fixes from mauricio