Fixed the declaration of some commands. Thanks Jan Burkl for reporting this issue.