fixes from ya