Fixed early parsing of basic system setup