Silence some warning in I18n
Quick relation refactor
Criteria compilation refactor