TS-3033: Fix build errors.