Fix few pendings TODO - Adrien