second set of fixes