Some fixes after review
Some fixes after review
jessp01/play-server,kaltura/play-server,kaltura/play-server,jessp01/play-server,kaltura/play-server,jessp01/play-server,jessp01/play-server,jessp01/play-server,jessp01/play-server,kaltura/play-server,kaltura/play-server,kaltura/play-server