fixes before 3.3