GI-649: resolving linker warnings