fixes for Hardware comparison