DTS M6 Integration

Compilation Fixes