Fix possible vmlang issues