Fixes from CR2