more fixes before release