fixes for Location sample