Some fixes.
Merge pull request #1682 from kaltura/IX-9.19.2-PLAT-1548

Some fixes.