OPAL-2570 - review corrections