fixes from deep