Some missed fixes