VDI: Fix lint and style issues.