Import dvfd patches from aotom
Fix type