Fixed cgl issues in the command classes