Minor changes to IqParser