Fixed few small issues to commands.