[VGA] More fixing and cleanup