Fixed video hangup + cleanups