Fix usage of configuration variables