minor fixes from first checkin