Minor fixes to comply to CRN policies