the first set of fixes