a few fixes to previoous checkin