Location sample improvements