Fixes for geo settings