OPAL-2605 - fixed build errors
Merge pull request #89 from kazoompa/bug-OPAL-2605

OPAL-2605 - fixed build errors