more fixes for Vanessa and Rich