a couple of fixes is added