BZ-9999: compilation errors fixed