fix various functions/vpc entries