Validator and config.h changes