RHEV table class, --disk option, bug squashing