Fixed config minor issues