Updates from latest 3.2 (Location fix)