Fix to allow CLI tools to run synchronously