some fixes before 1.07