Missed fixes from last commit