fixes for CR