fixes from review
fixes from review

kaltura/server,DBezemer/server,kaltura/server,DBezemer/server,DBezemer/server,DBezemer/server,kaltura/server,kaltura/server,DBezemer/server,DBezemer/server,DBezemer/server,kaltura/server,DBezemer/server,kaltura/server