Fix: fix compiler warning
Fix: Fix C command handler
Sync: local changes