Few Bug Fixes (Emergency and Video codec)