Fixed both pulling of config and config location