pair of fixes