Fixed some minor issues related to configuration loading