Code corrections according to CR