Location Fix and Scheduling improvements