Some fixes re location tracking