Fixed some changes in config-3.9