Missed fixes