OPAL-2605 - fixed build errors