Fixes due to changes in V4L