Fixed some parse code