Fix the default configuration blocks