Small changes to be compliant with the FR