Fixing server bugs and working on deprecating Video