New configurations and fix