Fix: do not load config files unless we need them