Fixed config issues