Some vendor changes