JDF-312 fix compiler errors