Various fixes to IQL