Some config.sh improvements