Minor Fixes

Location Based