fixes from cr