Added some more configuration validation