fix 2.9 classes and structures