Fix a few errors with the virtual command system