Small fixes on Config and Router