Config and validation fixes