fixed M4L devices & demo