More supplier fixes