STRATOS-1005 fixes