Various updates for TS core compatibility