Change some commands to be compatible to be called with the API.
Change some commands to be compatible to be called with the API.