TS-1475 Fix build errors