TS-2362 - fix minor issue, fix compiler problem.