Some fixes on tsc and sync conflict