fixes from updates