misc fixes
Merge pull request #933 from kaltura/IX-9.12.0-PLAT-1020

misc fixes