more ... fixes