a number of fixes