sonata 2.3 fixes