Parsing fixes