CommandGroup: Space bug fixes