More fixes just to get things rolling.