Fixed most of the new configuration fixes