Location sender fix. Minor fixes.