Updates for latest Optiq version