Video bug fixes