Fix TS RNPD Errors