Fixes as per merideth's request