Fix the configuration and minor changes