Fixed constructors for commands