fixes from cr2