Fixed some small parser issues