Parsing fixes and checks