Fix codes according to IRGN 2008