fixes from code review
fixes from code review

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