geo: Fix a series of warnings, some which actually pointed to real issues
commander: Update after merge