a pair of fixes