Fixes for CR