Fixed few parse bugs