new set of fixes