Minor updates

(already applied in the EGI-FCTF repo)