Typos and config files management fixes