Some tweaks allowing tokens in config