Fix ApiCommand
Fix more API