Some fixes on config