Fixed small parser issues