Minor changes
Merged confs