Fixes for [OPTIQ-332] and [OPTIQ-333]