Tidy up config key paths