Adjustment to location tracking, more warnings