Fixed vendor related bugs.