Fix compilation errors with current (release) version of DTP