Some fixes with configuration processing