Fix following Common and R66 last versions