Fix "create" and "list" commands