Fixed issues with the Configuration code