fixes from sonata