Fix some issues about the parsing