Config and tyoe fix