Couple of mexico & misc fixes